bitkeeper revision 1.1288 (425b9987hyix49ReaseCwzMc1AFxcQ)
authormafetter@fleming.research <mafetter@fleming.research>
Tue, 12 Apr 2005 09:48:55 +0000 (09:48 +0000)
committermafetter@fleming.research <mafetter@fleming.research>
Tue, 12 Apr 2005 09:48:55 +0000 (09:48 +0000)
commit43a4605d2106a956ab694d6d1460d5fada5f3f51
tree7052bad9c36af5e83435562d9e0b1bb9cbce3aae
parentc5cb74f9eb7653dac8d5ebcec3c0ad54c7d56736
parent700d1f8579e1c104670538012229338bb595435c
bitkeeper revision 1.1288 (425b9987hyix49ReaseCwzMc1AFxcQ)

Hand merged
linux-2.6.11-xen-sparse/arch/xen/Kconfig
linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
xen/arch/x86/domain.c
xen/arch/x86/shadow.c
xen/include/asm-x86/shadow.h